eed39899f4681840b072df48b52d3340cb7c7c1b,resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java,ResolverImpl,checkDynamicPackageSpaceConsistency,#ResolveContext#Resource#Candidates#Map#Map#,963

Before Change


        // of permutations so we know if the lower level check was
        // able to create a permutation or not in the case of failure.
        int permCount = m_usesPermutations.size() + m_importPermutations.size();
        for (Entry<String, List<Blame>> entry : pkgs.m_importedPkgs.entrySet())
        {
            for (Blame importBlame : entry.getValue())
            {

After Change


        // Imported packages are added after required packages because they shadow or override
        // the packages from required bundles.
        Map<String, List<Blame>> allImportRequirePkgs = new HashMap<String, List<Blame>>(pkgs.m_requiredPkgs);
        allImportRequirePkgs.putAll(pkgs.m_importedPkgs);

        for (Entry<String, List<Blame>> pkgEntry: allImportRequirePkgs.entrySet())
        {